From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 27 May 2019 07:04:01 +0000 (-0700)
Subject: mcproxy: Fix compilation with uClibc-ng
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org/%22http:/www.crowdsec.net//%22https%22/%22https:/collectd.org/%22http:/www.crowdsec.net/%22https%22?a=commitdiff_plain;h=04e7f66aa770cf876237d00e15d21372465fcb84;p=feed%2Frouting.git

mcproxy: Fix compilation with uClibc-ng

uClibc-ng also defines __GLIBC__, which messes up the check.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit b3ebe49dabd95cf834e1665117454448cea30009)
---

diff --git a/mcproxy/Makefile b/mcproxy/Makefile
index 637298b..456c1ba 100644
--- a/mcproxy/Makefile
+++ b/mcproxy/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=mcproxy
 PKG_SOURCE_VERSION:=93b5ace42268160ebbfff4c61818fb15fa2d9b99
 PKG_VERSION:=2017-08-24-$(PKG_SOURCE_VERSION)
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/mcproxy/mcproxy.git
diff --git a/mcproxy/patches/0003-add-sourcefilter.patch b/mcproxy/patches/0003-add-sourcefilter.patch
index 2f64975..6e50263 100644
--- a/mcproxy/patches/0003-add-sourcefilter.patch
+++ b/mcproxy/patches/0003-add-sourcefilter.patch
@@ -4,7 +4,7 @@
  #include <numeric>
  #include <unistd.h>
  
-+#ifndef __GLIBC__
++#if !defined(__GLIBC__) || defined(__UCLIBC__)
 +#include "sourcefilter.cpp"
 +#endif /* __GLIBC__ */
 +
diff --git a/mcproxy/patches/0004-add-defs.patch b/mcproxy/patches/0004-add-defs.patch
index a1105c9..19feb88 100644
--- a/mcproxy/patches/0004-add-defs.patch
+++ b/mcproxy/patches/0004-add-defs.patch
@@ -3,7 +3,7 @@
 @@ -38,6 +38,8 @@
  #include <unistd.h>
  
- #ifndef __GLIBC__
+ #if !defined(__GLIBC__) || defined(__UCLIBC__)
 +#define IP_MULTICAST_ALL 49
 +
  #include "sourcefilter.cpp"